v2.6.0
5fb73eac · Merge pull request #1936 from josephschorr/joseph.schorr/ALM-311/resources ·