Sync'd branch integration/inbound with upstream @ Thu Oct 23 13:46:46 PDT 2014