Merge devel into master

[mbenkmann]

I don't think there's a reason for users to use the old code instead of the current one. Also people who just look at the project's documentation to check it out will get the wrong impression as they're looking at outdated versions.

[jgeumlek]

This is probably for the best, even if the dev branch hasn't been fully tested. Some bugs is probably better than stagnating.