Merge pull request #13072 from jfrazelle/bump_v1.6.1

Bump v1.6.1