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

commit fe85c40e9cca2e01562537f9102dec6ccbcbc5e9 Merge: dd4c52e c46d2b7 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Fri Oct 16 22:45:08 2015 +0200 Merge branch '3.1' into 3.2