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