Merge remote-tracking branch 'origin/master' into 0.11
drwxr-xr-x - ext
drwxr-xr-x - tests