Better check and json -> json()
Merge remote-tracking branch 'tebeka/master'

Conflicts:
	bokeh/mpl.py