Sync'd branch integration/inbound with upstream @ Thu Oct 16 22:10:47 PDT 2014