rebased onto fb7e9c1743de8ce3e8ff8f9dccca24600ffcafb6
:thumbsup:
Commit 8cc1c93d fixes this pull-request
Pull-Request has been merged by mikem