Merge remote-tracking branch 'gitlab/merge-requests/5'

This commit is contained in:
2018-06-06 22:54:07 +02:00