The usual...
Merge branch 'master' of https://github.com/halhenke/doctor
The usual...