Merge branch 'kasperpeulen.patch-1'