Comment by lundman

Just a matter of cherry-picking it in. I'll get around it it soon