I'm done with both: getting the OCT mailing list updated and I've committed this morning our bugfixes for 5.4.1.