Merge branch 'master' into python-3.4