instead of crashing on functions, render something slightly more useful
Merge branch 'master' into functions

Conflicts:
	src/JSON.jl