Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 16:32:43 PDT 2014