one fix for the functional tests
Merge branch 'dev' of github.com:votinginfoproject/Metis into dev
Merge branch 'dev' into style-updates