merge devel-0.6 in ivano/frog