Merge branch 'master' into tutorial

Conflicts:
	java-backend/src/main/java/org/kframework/backend/java/symbolic/SymbolicRewriter.java