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