Fixed plurals of max and min
Merge branch 'development'