Merge pull request #1109 from kissg1988/vala