1.6 refund fix
1.5 and 1.6 updates