monthly merge of devel into master

this is an important merge, because this is the first commit where the master branch will run on the new cluster