Merge "String localisation enabled in spec file" into devel/master