Merge branch 'master' into slayoo-patch-3

This commit is contained in:
Sylwester Arabas 2018-01-08 11:47:01 +02:00
commit cefd560086

File diff suppressed because one or more lines are too long