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