Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 11:02:37 PDT 2014