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