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