rebased onto 3c0d6935615f1f74980971104a86110954572865
rebased and resolved the merge conflicts
@pfrields is putting link: in front of the links, should we be consistent?
link:
One small comment, :thumbsup: for me otherwise
Finally @pfrields stopped using the link: so we can merge this :)
Pull-Request has been merged by pingou