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

commit 114b8126406467d936c968b418afb3c6c2cd8340 Merge: de1e1e2 f2a0d53 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Thu Oct 1 22:17:29 2015 +0200 Merge branch '3.1' into 3.2