Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 20:28:41 PDT 2014