This is the pull request for the official v2.5 release. It has been packed and combined, and the copyrights are updated. I have smoke tested, and it looks good. I will run a full test suite in each output mode for one brewer just to be sure, but it looks good at the moment.