Merge pull request #489 from danvk/combined-dev