Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 14:47:39 PDT 2014