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