server admin
fix mastersalt top
Merge remote-tracking branch 'origin/stable'