Commit before merge with Olof.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>