Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 00:38:39 PDT 2014