More work.
Merge branch 'master' of https://github.com/rostgaard/02242