Merge branch 'release/1.7'
Merge branch 'release/1.8'
Merge branch 'master' of github.com:CodePolaris/eidos