Issue 8005 by tj: Better shuffle method
Merge branch 'development' of github.com:aakb/digitalabc into development