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