Merge branch 'vader_fix'