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