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