[crux-commits] ports/opt (3.1): Merge branch '3.1' into 3.2

commit 4a23f1dd7b611ecc414a8c4dbb9f86441c007904 Merge: e3ea8a2 8004622 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Tue Sep 22 22:30:53 2015 +0200 Merge branch '3.1' into 3.2