Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 29 04:29:18 PDT 2014