Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 10:54:24 PDT 2014