Merge branch 'release/0.4.11' into develop
corrected class name conflict from old copy/paste.
rp
Merge branch 'release/0.4.12'