Fix compilation problem on GCC (control reaches end of non-void function)
Merge branch 'next' into daniel_geo