Solved 061.
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.lisp
	pe.asd