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