Final tweaks to close redmine #3870