Back from vacation. Fixing bugs for 2.5. …

Back from vacation. Fixing bugs for 2.5.1. Drafting my 2.6 proposals.

#251, #26