v1.1.6 release
Merge remote-tracking branch 'origin/dev'