Update dev with RC6 release changes

Includes the graceful cmake abort for #588