Merge version 3.1.6 into master