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