Bugfix.
Merge branch 'master' of github.com:dvorberg/t4