Saving the day for jslave on Alpine (asgard) #1

Open
pcaseiro wants to merge 4 commits from develop into master

4 Commits