- By Benjamin. Fixed bug 2710.
- By Benjamin. Fixed bug 2711.