Merge branch 'master' into 'patch-1'

# Conflicts:
#   README.md
This commit is contained in:
Dorian Zedler 2018-06-29 20:15:50 +02:00
commit fed5806ed6

Diff content is not available