Merge remote-tracking branch 'origin/0.10'
drwxr-xr-x - ext
drwxr-xr-x - tests