Sync'd branch integration/inbound with upstream @ Thu Oct 30 13:17:45 PDT 2014