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