Fix voteskip calculation
Merge branch 'master' into dev