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