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