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

commit a436439e78a7f0da1891e1ce064f0a12f3987b21 Merge: 637e169 ddcb2fb Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Fri Nov 6 00:30:28 2015 +0100 Merge branch '3.1' into 3.2