Merge trunk into branch "amiga-library"