Merge branch 'minor_fixes' of https://github.com/evgeni/grml.org into pull-request-4