Assessing contagion risk from energy and non-energy commodity markets