don't presume Integer for LINE and COLUMN, fixes round-trip
Merge branch 'master' of https://github.com/clojure/clojure

Conflicts:
	src/jvm/clojure/lang/Compiler.java