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