Update docent

merge with master