Patches to fix over-zealous ploop.
Patches to fix over-zealous ploop.

timnboys/Feathur,Feathur/Feathur,zvenzzon/Feathur,Feathur/Feathur,timnboys/Feathur,timnboys/Feathur,Feathur/Feathur,zvenzzon/Feathur,timnboys/Feathur,zvenzzon/Feathur,Feathur/Feathur,timnboys/Feathur,zvenzzon/Feathur,zvenzzon/Feathur,Feathur/Feathur