Built cross-platform-shapes from commit 0b32c4c on branch master