Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 14:23:42 PDT 2014