Merge pull request #1 from hannesmannerheim/master

Merge commits from qvitter 6.10.14