New version, update standards version to 3.9.5
Merge 1.24 from github
New version, update standards version to 3.9.5