Merge branch 'master' into develop
DDBEASY 166 - Removes useless popup.
DDBEASY 166 - Fixes warnings.
Merge branch 'DDBEASY-166' into develop
Merge branch 'develop'