Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	gradle.properties