Merge branch 'hotfix-2.3.5' into develop
Copy pasta fail breaking the proposal accept button fixed, fixes #293
Merge branch 'hotfix-2.3.6'