Manual merge pull request

From
https://github.com/DennisWelu/appspotdemo-mono/commit/fcd6d351a7777086bb90be34c188f0a8d50dd477
Manual merge pull request

From
https://github.com/DennisWelu/appspotdemo-mono/commit/fcd6d351a7777086bb90be34c188f0a8d50dd477
Manual merge pull request

From
https://github.com/DennisWelu/appspotdemo-mono/commit/fcd6d351a7777086bb90be34c188f0a8d50dd477