Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 06:19:37 PDT 2014