cleanup update rules
Merge branch 'devel' into maarble-devel