rebased onto 4fba94ca35a02a8b340c4fff19a80f03d91c4924
rebased onto 1da6ff05800c5350da2d8314b640e813b2fdefa9
rebased onto 8fdfc721d4c6ccca9e4105089b26ede82d9c6881
Commit b92fa538 fixes this pull-request
Pull-Request has been merged by mikem