Merge "Changed ImageView to utilise ImageRenderer." into devel/master