Merge in latest devel, adding description page and fixing explicit use of default=mm