Merge pull request #713 from valentinewallace/cross-platform-ci