Merge branch 'releases/2.1.6-2.2.6-1.12.4'
Prepped site for 1.12.5 release
Merge branch 'releases/1.12.5' into develop