Remove code accidentally merged into master
Merge branch 'master' into devel
Undo merged change