Version bump to 1.1.6
Merge branch 'dev'
Merge branch 'master'