Correct make dist failure
Merge branch 'doxygen'
Correct scroll bar scrolling in the train kind dialog
Merge branch 'scroll'