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