Merge devel into master branch

After the latest compilation and Jenkins fixes, most builds have no warnings, and all build. There a few failing tests that should be investigated, but I believe that this is a good point to merge into master and create a tag, or even a versioned release. Then we can start basing feature branches on master and requesting merges into devel again for the next release cycle.