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