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