Hi nee,

I haven't had the opportunity to thoroughly playtest this to be sure
everything is in working order, but the patch looks good and the package
builds fine for me, so I've pushed it to master.