Merge remote-tracking branch 'origin/4.7'

# Conflicts:
#	build.gradle
#	gradle.properties
#	package-lock.json
#	package.json