Sync'd branch integration/inbound with upstream @ Wed Oct 29 14:04:36 PDT 2014