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

Conflicts:
	gaiatest/tests/manifest.ini