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

commit 8003656a486cf5b2ecfc2e1edce82a1ecda43272 Merge: 5bff501 17bc714 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Thu Sep 3 13:11:05 2015 +0200 Merge branch '3.1' into 3.2