Bug 918701 - gaia.json auto-update commits should use a=gaia-bump not a=NPOTB; r=aki
Bug 918818 - Remove 'install gecko' hack from b2g_emulator_unittest.py, r=jgriffin
Merge remote-tracking branch 'origin/master' into vcs_multi_repo