Merge branch 'master' of D:\Workplace\git\fis-kernel with conflicts.
Merge remote branch 'origin/master'