Stefan Profanter 6752ff9518 Merge branch '1.0' into master 6 lat temu
..
open62541 6752ff9518 Merge branch '1.0' into master 6 lat temu