Merge branch 'master' into dev
treef21387e37066df0768ab927855688df690fe1601
-rw-r--r-- 35147 COPYING
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - web-site