Make sphinx theme selection error tollerant
Merge branch 'jascis-20' into devel
Merge branch 'devel'