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