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