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

commit 7831772730043c07ec227f9612b27819f18f1a84 Merge: c578e2b 23b2780 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Fri Nov 13 19:34:38 2015 +0100 Merge branch '3.1' into 3.2