Merge pull request #4969 from kissg1988/vala