- Source spell checked for duration > 0 when considering stacking
Merge remote-tracking branch 'upstream/master'

his merge is necessary,