Fix platform name in Python 2 with --verbose (Closes #1228)
Merge remote-tracking branch 'origin/master'