Update for Python 2.7 support.
Fix lint.
Merge master.
[#1037] Update for python 2.7 support.