@Meik: I hope I did the revert+merge correctly. Please check! (In particular there are some commits on master but not on 0.6.4. This time the changes introduced by these are preserved - in master.)