Merge branch 'develop' into fbsd12

diff --cc Makefile.system
index 25ac38d,3cf5a16..3987460
--- 1/Makefile.system
--- 2/Makefile.system
+++ b/Makefile.system
@@@ -11,14 -11,10 +11,14 @@@ endi
  
  # Catch conflicting usage of ARCH in some BSD environments
  ifeq ($(ARCH), amd64)
 -override ARCH=x86_64 
 +override ARCH=x86_64
  else ifeq ($(ARCH), powerpc64)
  override ARCH=power
- endif 
 +else ifeq ($(ARCH), i386)
 +override ARCH=x86
 +else ifeq ($(ARCH), aarch64)
 +override ARCH=arm64
+ endif
  
  NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib