2nd commit.

Signed-off-by: Daniel Granlund <dgranlund@bloomberg.net>