Trying to fix bug #2392.
Merge branch 'develop' of ssh://git@git.lsts.pt:443/neptus into develop