Small improvement to Resources page
Small improvement to Resources page (again)
Merge branch '1_2_X'