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