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