Fixed a simple build error on FreeBSD
Merge branch 'dev' to create version 1.2