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