Standing merge request to synchronize changes from unstable branch into master branch:
changes:
if the OpenFlipper-Free mr passes, please also merge this one. https://graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/merge_requests/305