Change-Id: I120b47c0af14afec01b653a01baac78d6ca8a78e Reviewed-by: David Schulz <david.schulz@digia.com>