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