Merge with upstream/2.5-stable
Update stackato.yml
Update Gemfile