Merging last fix(es) from SLE 12 to openSUSE 13.2

- At least the last one deserves an online update