Bump master to 6.1.16

Bump master to 6.1.16