Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 10:08:41 PDT 2014