Built cross-platform-shapes from commit b45952c on branch master