Change-Id: Id8b42469fc7fdc22278bcaf4f5cb60f42d8f6c53 Reviewed-by: Daniel Teske <daniel.teske@digia.com>