bug#1844, modification properties
Merge branch 'b' of https://github.com/ladislav/r3 into community