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