remove trailing whitespaces
remove trailing whitespaces
merge branch next into py3