pull changes from Unstable to master branch (!38) · Merge requests · OpenFlipper-Free / OpenFlipper · GitLab

Martin Schultz requested to merge unstable into master Aug 28, 2017

corresponds to this MR:

https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/merge_requests/305