Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 29 13:19:44 PDT 2014