VERSION 1.6.11 (closes #4401, closes #4404, closes #4403)