Merge branch 'master' into docker

This commit is contained in:
dosse91 2017-11-02 07:20:13 +01:00
commit b090b6f0d9

File diff suppressed because one or more lines are too long