Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 02:34:25 PDT 2014