active wishes displayed and noticed
Merge remote-tracking branch 'origin/master'