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