Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/capistrano/tasks/assets.rake

But don't use this branch for p05030 until Capistrano fixes https://github.com/capistrano/capistrano/issues/889