Merge branch 'hotfix/delicious-rand'
94
Merge branch 'hotfix/94' into develop