Merged wiki changes.