Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 22:48:39 PDT 2014