Merge branches 'empty-lines-in-comment' and 'init-bare-directory' into testing