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