merge trunk, keep no280 "pure"
remove stray tip280 remains