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