Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  1 01:17:37 PDT 2014