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

commit f83ee27a28ede5f73a2a811cd752078d084ca41b Merge: 5fc56c6 c09f332 Author: Juergen Daubert <jue@jue.li> Date: Mon Jul 6 11:57:57 2015 +0200 Merge branch '3.1' into 3.2