config update fix
Merge remote-tracking branch 'adrianp-github/poo' into pu