fix #962
Merge branch 'master' of github.com:ericdrowell/KineticJS