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