Log Message:
Pull in three commits from upstream
mainly related to https://github.com/westes/flex/issues/113
"v2.6.2 introduces behavior change that is incompatible with previous \ 
versions"

This fixes at least doxygen