version => 2.1.6
Merge branch 'master' into tags-master