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