* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a': DO NOT MERGE. may fix build on some version of gcc