Back to -dev.
fix build error under FreeBSD 7.x.
Merge branch 'Timandes-570' into v1.4