Merge branch 'hackfest_minor_fix' into 'staging'

minor fix due to a problem with dns resolution at some networks

See merge request !73