1.6.15 (closes #4468, closes #4471, closes #4470)