merge from guile master