Requested by maintainer Committer comment: ..and while at it do some minor changes to Makefile PR: 276679