Merging centos-7 branch #1

Merged
dani merged 2 commits from centos-7 into master 2018-11-17 08:58:43 +01:00

2 Commits