Resolved conflict when applying the last stash
Merge branch 'master' of github.com:jsxgraph/jsxgraph