Merge "Remove vector image renderer plugin" into devel/master