Sync'd branch integration/inbound with upstream @ Thu Oct 16 15:18:41 PDT 2014