Sync'd branch integration/inbound with upstream @ Thu Oct 23 21:10:44 PDT 2014