Merge MR-10

This commit is contained in:
Jan Engelhardt
2018-11-17 12:32:56 +01:00