Testing new features.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test.pike
Another test.
Merge pull request #5 from andjo/master

A few more tests.