Merge commit '012fae4655b61007f35d4b59e3baf66a1bf0c46a'

Conflicts:
	src/org/server/compile.jm
check