- By Benjamin. Fixed bug 3016 and some others.