Change-Id: Iff7ce74c947dba7522b47991fb0217916dee921a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>