Function hasn't been merged to release for some time. There are a number of fixes on trunk which look okay to me. If no one objects I'll merge once the release branch opens. Daniel