Merge commit '045dd55d2251fabf967f0648c6823fb711d8f587'

Conflicts:
	subtree/bokehjs/static/coffee/base.coffee
	subtree/bokehjs/static/coffee/common/plot.coffee
	subtree/bokehjs/static/coffee/renderers/glyph/circle.coffee
	subtree/bokehjs/static/coffee/renderers/glyph/glyph.coffee
	subtree/bokehjs/static/coffee/renderers/properties.coffee