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