Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 11:49:41 PDT 2014