Merge "Updates following rename of PropertyBuffer to VertexBuffer" into devel/master