Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 00:18:42 PDT 2014