Fix error name 'raw_input' is not defined (for Python3)
Add raw_input import for Python 3 compat
Merge remote branch 'upstream/master'