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