Release 1.7.23

merged in upstream/master