Fix Jenkins build (hopefully)
Merge 'fix_jenkins' into dev