Testing

Both commits are against 'snapmergepuppy'
Neither of these commits is required by TahrPup 6, so probably not required in woof-ce.
I have generated this pull-request, in case you want to use either of them anyway.
gyro