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