Merge maintenance-work branch (now with less errors!):