Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 14:00:22 PDT 2014