Fix for regedit suite
Merge branch 'ashen-shugar'