Merge branch 'stoewer' into wdat2-develop
Crayon: update to latest version.