Merge branch 'JAL-1378_jb2.1cli' into RNAalifold