File changed for hotfix 1.1
Merge branch 'hotfix/1.1'
Updated to hotfix 1.2
Merge pull request #1 from mortenthorpe/hotfix/1.2

Hotfix/1.2