BRANCH 4.6: added protection for when delay is a basestring
BRANCH 4.6: added protection for when delay is a basestring

diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC