Fixing dentals.
Merge branch 'development' into release-0.4
Merge branch 'release-0.4'