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