feature 1.8 done
done
conflict resolved
Merge branch 'master' into develop
Merge branch 'release/release1.1'
some minor fixes
Merge branch 'release/release1.2'
Merge branch 'release/release1.2' into develop
release 1.3 done
Merge branch 'release/release1.3'