bug#1956
Merge branch 'f' of https://github.com/ladislav/r3 into community