Add wiki changes from 56ddc58..23683b9

Made after the repo was branched