Squashed commit of the following:

commit 321969d0e4ea7ec8274a6a0af673c4454474b3e7
Author: Bue Petersen <bue@praqma.net>
Date:   Wed Dec 10 00:38:18 2014 +0100

    New data log line