merge 1 year old devel branch into master to start developing on fresh grounds
This will create a new commit in order to revert the existing changes.