[vcmi/f42: 3/3] Merge branch 'f41'