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

commit 159ac81220f7d94ee92942b478c5a28548675053 Merge: 0028eb2 6870161 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Sun Nov 8 23:48:14 2015 +0100 Merge branch '3.1' into 3.2