Merge branch 'maarble-devel' into devel
put SCALETYP value in quotes
Merge branch 'devel' into maarble-devel