Merge "Add BORDER_SIZE property to ImageVisual" into devel/master