fix 3.0.80 build again
fix indention
Merge branch 'master' into devel
fix indentations