am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
  Unable to push files to Windows 7