Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 11:18:42 PDT 2014