Merge tag '1.10' into develop

Version 1.10
Bugfix, check if no themes defined yet.
Merge branch 'release/1.10.1'