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