Bugfix release. Please merge.
-- 
Tom Zander