Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  1 09:48:36 PDT 2014