Commit 649053d2 authored Dec 13, 2018 by Christian Kniss

Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle

There are no changes