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