Merge remote-tracking branch 'craigcitro/master' into 74-warn
remove redundant test