Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 29 06:58:52 PDT 2014