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

commit ace78c17463c65add15237b60b930846de9c9e40 Merge: 80a2ead e8ae534 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Aug 12 00:33:28 2015 +0200 Merge branch '3.1' into 3.2