Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 19:42:40 PDT 2014