Sync'd branch integration/inbound with upstream @ Thu Oct 23 00:40:42 PDT 2014