OK full dump from the latest available backup of 3.1.4

update for 3.1.4.6 went a bit down the drain this is the first step of
getting Dubbz code into it.