Merge pull request #2647 from kissg1988/vala