Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 21:12:36 PDT 2014