Changes for pylint
merge latest devel
Pylint