liquidation fix for calculating individual investors
Merge branch 'walport-water' into testing