Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  1 20:02:33 PDT 2014