Merge "Hide Size, and use Size2D instead." into devel/master