Fixing issue #66
Merge branch 'hotfix/1.2.2_3.1' into Development
Merge branch 'release/1.3'