Convert comment-dwim-line into a defadvice.
Use kill-whole-line in the kill-region advice.
Merge branch 'master' of https://github.com/mwlodarczak/.emacs.d