Merge branch 'master' into dev
Fix tests. Fix #803
Update theme
2.8.3 released
Merge branch 'dev'