Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 10:23:39 PDT 2014