Merge pull request #642 from krlmlr/627-integration

Automatic integration testing; closes #627
Merge branch 'master' into develop