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