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