Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 06:37:40 PDT 2014