Merge branch 'master' of github.com:bowmanat/relate into always-correct