Merge branch 'editors' into config
Added ability to include SMB/CIFS support.
Merge branch 'config'