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