Task #5007 - Fix bugs from task #4499.
Merge branch 'master' of github.com:explivre/ExpressoLivre3 into task5007