Merge branch 'test_paolo_JAL-1065' into Tcoffee_JAL-1065