berlin tweaks
Merge branch 'nmrg-berlin' of github.com:britram/qof into nmrg-berlin