Merge branch 'master' of github.com:JuliaLang/julia

Conflicts:
	base/deprecated.jl
	src/disasm.cpp