rebased onto 7d7b634875ac7f7c9448cca9453c7eb77207c6cd
:thumbsup:
Commit e873a213 fixes this pull-request
Pull-Request has been merged by mikem