Merge branch 'licy183-ecelgamal' into master