final port of mukustes fixes branch

..which makes rev 921 the final for 9.2.1  :)

git-svn-id: svn://svn.code.sf.net/p/vpinball/code/trunk@921 14438d79-0ffd-4333-8ae7-ea2bdd901387