Merge devel into master

By request of Dimitri