Merge branch 'master' into docker

This commit is contained in:
adolfintel 2019-02-03 12:33:13 +01:00
commit f6d70b6dc9

File diff suppressed because one or more lines are too long