Ex-79(kmeng/cgates): Committing merge.py changes.