version
changed version
Merge branch 'master' into stable
bug regle
Merged bug4 into stable