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