Merge trunk into amiga-library branch