Vox beards.
Reverting to as advertised.
Merge remote-tracking branch 'upstream/master'
Compile fix.
Merge pull request #3501 from Segrain/master

Fixes.