- By Benjamin. Fixed bug 3029, 3030, 3031 and some other missing committed code.