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