* Merge from Debian unstable. This merges the vim addon fix in 2.7.18-2 (LP: #1163927). Remaining changes: - debian/puppetmaster-passenger.postinst: Make sure we error if puppet config print doesn't work - debian/puppetmaster-passenger.postinst: Ensure upgrades from <= 2.7.11-1 fixup passenger apache configuration. - Drop Build-Depends on ruby-rspec (in universe): + debian/control: remove ruby-rspec from Build-Depends + debian/patches/no-rspec.patch: make Rakefile work anyway if rspec isn't installed so we can use it in debian/rules. * Drop upstreamed patches: - debian/patches/security-mar-2013.patch