Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 17:13:29 PDT 2014