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