Sync'd branch integration/inbound with upstream @ Thu Oct 30 11:54:33 PDT 2014