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