Fixes #281
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into python3