LGTM. Thanks!
rebased onto ba7de5fcc7c270ab70dca1d34d6ef8ce3a17d590
Pull-Request has been merged by james