Version bump after merge from pguelpa