This obsoletes the remaining patches in id:1353792017-31459-1-git-send-email-david at tethera.net This isn't really v6 of these particular patches, but oh well.