Emergency fix for tough customer :)
Merge branch 'hotfix/Emergency_Fix'
Merge branch 'master' of https://github.com/tberkers/Valid-Workshop-201406