Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 20:03:42 PDT 2014