Merge branch 'master' into testing
drwxr-xr-x - doc
drwxr-xr-x - include
drwxr-xr-x - src