merge from upstream
Merge branch 'master' of https://github.com/RaresAmbrus/scitos_apps