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