Sync'd branch integration/inbound with upstream @ Thu Oct 30 08:12:41 PDT 2014