Remove redundant condition
Merge branch 'master' of github.com:rowan-m/12tdds into develop