Merge remote-tracking branch 'upstream/master'

signature=5183179 (modification coming from Gary's King safety tweak)