Commit 4030355e authored by bernhard's avatar bernhard

Merge remote-tracking branch 'upstream/master' into tasks

# Conflicts:
#	build.gradle
parents db22ee8b e04df070
Pipeline #30 canceled with stages