Merged master into OpenSUSE branch

These are all pointing to "master". I think it is OK leaving it like that.