Sync'd branch integration/inbound with upstream @ Thu Oct 16 11:39:46 PDT 2014