oop, dropped a * on the floor
Merge branch '7.40'