Built cross-platform-shapes from commit 5e51168 on branch master