[NLopt/el5: 3/3] merge differences from master