Merge remote-tracking branch 'refs/remotes/origin/master' into api-v2

Conflicts:
	mustache.lisp
	t/test-api.lisp
	t/test-spec.lisp