Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 07:03:40 PDT 2014