Merge pull request #1767 from unxed/optional-spdlog