Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
you can now switch online on history versions from 1.6 to the latest
Merge branch 'master' into develop