Merge pull request #2804 from mtelka/aalib