Merge 6.1.x into Master

Makes master 6.1.14