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