Compilation fix on Linux.
Merge branch 'next' into vault