5531c7300d
(cherry picked from commit 2d3388d6d3)
# Conflicts:
# src/SolutionInfo.cs
(cherry picked from commit 2d3388d6d3)
# Conflicts:
# src/SolutionInfo.cs