Merge with master
Update _config.yml with exclude list