Merged changes from svn trunk into qucs-qt4-qt3support (r1845 by crobarcro)