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