Updated for 1.5.2 (closes #598)