rebased onto f246cf99b5c3fef74576ce31bf5fb60328c35b0f
Commit 9cd28519 fixes this pull-request
Pull-Request has been merged by james