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