Fix for 10.8
Merge branch 'devel'