Sync'd branch integration/inbound with upstream @ Thu Oct 30 13:07:43 PDT 2014