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