Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180604-pull-request' into...