Merged master into OpenSUSE branch

Seems to be quite similar to what I've done as well. We expect Travis to "just work" :) and do not check it properly.