Merge branch 'master' into SLE11-SP1

suse-commit: 7e732753a986fbeabd916029a558425767329372