Sync'd branch integration/inbound with upstream @ Thu Oct 16 20:20:42 PDT 2014