Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 01:42:33 PDT 2014