Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc configure.ac
index 56c9d1b9106e7ff56073e412fc7f8b7a24b63a95,b71d648f153001de9529bbde480bc4e2a5f9e6eb..4f5d8337ee7b3c086d83700a3323c58e46d43ead
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -608,10 -548,8 +608,9 @@@ AC_CHECK_FUNCS
          llround \
          localtime_r \
          lround \
-       mach_approximate_time \
          memmem \
          memset_s \
 +        mmap \
        pipe \
        pipe2 \
          prctl \