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