Sync'd branch integration/inbound with upstream @ Thu Oct 16 12:04:42 PDT 2014