I've merged some fixes back from master to the 1.18 branch, and plan to release 1.18.4 in the next few days. Give a shout if there's anything wrong on the branch, or if there's any other changes that should be picked up. - ajax