Jacalvo/3.1 packaging

to be merged when master becomes 3.1