Change-Id: I169dcc02f02a647b0a2ae6478227a852be922de2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>