Merge branch 'master' into v2.1
treef4f7d6c897ecfe849e0691d8734440ad32a24461
-rw-r--r-- 71 .gitignore
-rw-r--r-- 2932 COPYRIGHT
-rw-r--r-- 5727 Makefile
-rw-r--r-- 453 README
drwxr-xr-x - doc
drwxr-xr-x - dynasm
drwxr-xr-x - etc
drwxr-xr-x - src