Sync'd branch integration/inbound with upstream @ Thu Oct 30 15:53:48 PDT 2014