Alter works on paintings and maps

MAGIC-67 #done
Merge branch 'master' into 3.1