Merge remote-tracking branch 'ralfharing/vh1'