Get rid of Python 3.4 deprecation warning
Merge branch 'master' into c_impl