Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 11:33:25 PDT 2014