Merge remote-tracking branch 'upstream/master' into master

Lawrence

2020-10-25 9a84ef06adff44bc6e24caa8bc16731eff061f3c

 .gitignore

@@ -11,7 +11,7 @@
.mtj.tmp/

# Package Files #
*.jar
#*.jar
*.war
*.nar
*.ear