Bump to 2.1.6 + Changelog update