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