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