Merge pull request #3088 from Montellese/gui_input_validation