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