Change-Id: I44f1859b6d91e20a2a15146c6587e4a51c70aa90
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>