Merge pull request #2989 from ey6es/master

That'll teach me not to wait for the PR build.