Merge remote-tracking branch 'origin/merge-requestes/134'

This commit is contained in:
2020-01-09 19:00:37 +01:00