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