version 3.6.11 released
Merge branch 'master' into develop