Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	common/src/main/java/ca/fxco/memoryleakfix/utils/MixinInternals.java
#	gradle.properties