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