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