Merge branch 'Development'
Version 1.3
Merge remote-tracking branch 'origin/master' into Development