Pushed, with a few small modifications, and backpatched to v18 where the errormessage was introduced.
--Daniel Gustafsson