merge from funky master