Release 1.2.6, see ChangeLog for details

This is primarily a hotfix release. A few commits have been cherry-picked from
develop and do not include some of the resume fixes as they have not been tested
thoroughly as of yet.