Merge collabora
This is a merge request to sync collabora/master
from debian/master
which included Debian release version 20180302-4 and new patches.
This is a merge request to sync collabora/master
from debian/master
which included Debian release version 20180302-4 and new patches.