Catch remaining "3"s in the 3.5 sidebar
Merge branch 'puppet35'