Change-Id: I24c6041fed850523135bc42a9cff768228046a80 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>