Merge branch 'fix-tests' into 'master'

On Python 2.6 TestCase.assertRaises is not a context manager



See merge request !51