Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet