Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 09:33:38 PDT 2014