Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 10:29:39 PDT 2014