Sync'd branch integration/inbound with upstream @ Thu Oct 30 08:41:00 PDT 2014