Sync'd branch integration/inbound with upstream @ Thu Oct 16 11:24:45 PDT 2014