The attached v5 is a rebase with no new changes just to get a fresh run in the
CFBot before pushing. All review comments have been addressed and the patch
has been Ready for Committer for some time, just didn't have time to get to it
in the last CF.
--
Daniel Gustafsson