Merge pull request #908 from colincross/multipass