Merged Lukas pull request manually by copy & paste.