(cherry picked from commit e2a40c17) This looks like a bugfix and deserves to go Applications/17.04. CCMAIL: paolini@dmf.unicatt.it