Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 11:43:41 PDT 2014