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

commit e22f99efdaf6e372e20f778d9e184a27045c7cf2 Merge: fe85c40 c119da6 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Fri Oct 16 22:50:29 2015 +0200 Merge branch '3.1' into 3.2