python 3.4 compatibility
Merge remote-tracking branch 'origin/master'