Merge fixes

This commit is contained in:
vladest 2018-04-19 21:04:11 +02:00
parent ab1a89a6f9
commit b191ad866f