merging release 0.7. Delta /tags/0.7 - /branches/0.7-stable@848
Due to problems with 'svn merge' (skipping added files?), I've copied added files manually.