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