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