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

Conflicts:
	doc/stdlib/base.rst