Fix broken build again
Merge branch 'develop' of https://github.com/jploudre/undevelop into develop