addition on r11322 - update installer in 2.0.4.1 with version from trunk (fix #1072, #1461, #1462, #1467, #1470)