Built cross-platform-shapes from commit 747a940 on branch master