control points: drag and drop
Merge branch 'master' into gh-pages