Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 04:15:09 PDT 2014