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