Merge remote-tracking branch 'upstream/master' into buy_app

Conflicts:
	gaiatest/tests/marketplace/manifest.ini