Testing merge of hotfix into Dev and Master
Merge branch 'hotfix-0.2'