Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  1 03:49:35 PDT 2014