fold in changes for 0.2.4.10-alpha