Rebase origin

Review please @coosh (part of the version upgrade @dneufeld just emailed)
I overwrote this in site-datadog