Shouldn't have been committed to next
Merge branch 'next' into kilrah/Switch_and_pot_warnings
Shouldn't have been in that branch
Safer switch warning entry - fixed