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