Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150707-1' into staging