Merge branch 'master' of ssh://phabricator.ict.tuwien.ac.at/source/SoC_Rosa_repo into feature/linear_functions

Update branch feature/linear_functions to be up-to-date with master