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