many changes
Merge branch 'master' into branch

:kbimerge mkbkbkbkbkbkbkbmerge masterkb:x:x:q!
fixes