Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 23:07:37 PDT 2014