Fix deprecated code#259

gampnico wants to merge 8 commits intofmaussion:masterfmaussion/salem:masterfrom

gampnico:fix-deprecated-codegampnico/salem:fix-deprecated-codeCopy head branch name to clipboard