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