Added some patches
Merge branch 'master' into tsk_ModularGui