Merge pull request #948 from sipa/unstuck