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