Sync'd branch integration/inbound with upstream @ Thu Oct 30 12:29:35 PDT 2014