Fixed issue #1509
Merge remote-tracking branch 'nuvolabase/master' into 2qfix