Fixes ContinuumIO/bokeh#1243
Merge pull request #1247 from M4urice/master

Fixes ContinuumIO/bokeh#1243