Selfatari: Allow capture-from-within moves
Merge branch 'master' into moggyppl