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