davidarndt Merge branch 'vanilla'