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