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