Sync'd branch integration/inbound with upstream @ Thu Oct 30 17:25:45 PDT 2014