new upstream version 1.6.1