Assume OS X clients are compatible with every architecture
Merge branch 'develop'