Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 29 23:19:38 PDT 2014