Merge pull request #1126 from drizztbsd/master