REL-726

Partially to test the pull request mechanism, partially because I have no idea how to do REL-726.