61bddad2ea
Conflicts: include/canvas.js include/default_controls.js include/vnc.js
Conflicts: include/canvas.js include/default_controls.js include/vnc.js