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