Merge branch 'master' into python3
fixed a python 3 bug
added a test-case to pinpoint the problem
fixed the bug which turns out to be a simple typo
Merge branch 'master' of git://github.com/enthought/traits into fix-failing-special-instance-trait-events
Merge branch 'master' of git://github.com/enthought/traits into python3

Conflicts:
	.travis.yml
	traits/tests/test_cythonized_traits.py
Merge branch 'fix-failing-special-instance-trait-events' into burnpanck
Merge branch 'python3' into burnpanck

Conflicts:
	.travis.yml