Update Gemfile.lock
Fix failing Haml test case (fails in 4.x)
Add pruner bug fix to release notes
Merge release-3.5.x branch