whack-a-mole basically
Merge branch 'master' into excontrib