Commit ee2439e3 authored Apr 08, 2019 by Christian Kniss

Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle

There are no changes