Merge pull request #387 from fperrad/20191019_lint some linting (cherry picked from commit 8095b3b61240628f052153d6c37539955632564e)