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