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