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