[NLopt/f20] (3 commits) ...merge differences from master