merge bugfix from Softsusy upsteam