Merge branch 'redcore-1.4.0'
Merge pull request #332 from redCOMPONENT-COM/master

Master