fix elections thing
Merge branch 'master' into use-own-iframe