Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  1 16:28:36 PDT 2014