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