Merge devel branch into master

Master is currently not installable due to minor problems, so merging latest devel branch into master.