Merged master into OpenSUSE branch