The attached patch fixes this.

CommentFileSizeAuthor
features.inc_.patch613 bytesjoelstein