merge from master

diff --cc candi.cfg
index 253899957f35c4332da7101c4ed5d0fffced6c47,321dab348ebe73759b5a7c1ad8618751ed2c44c7..e8ab8b9ed529e98213188764ef7e4d8fb9b5659b
--- 1/candi.cfg
--- 2/candi.cfg
+++ b/candi.cfg
@@@ -90,8 -90,8 +90,8 @@@ PACKAGES="${PACKAGES} dealii
  
  #########################################################################
  
- # Install the following deal.II version (choose master v9.3.0 ...)
+ # Install the following deal.II version (choose master, v9.3.0, v9.2.0, ...)
 -DEAL_II_VERSION=master
 +DEAL_II_VERSION=v9.3.3
  
  #########################################################################