Merge leokraemer:develop branch into SPSS13:develop

update SPSS13