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