Change-Id: I61fc9fb05dc901765c1c348cfab29b3d2eaa7516 Reviewed-by: Marco Bubke <marco.bubke@digia.com>