0df29b
Merge branch 'users/ykaukab/master/for-next' into master Pull a supported.conf update from Yousaf Kaukab.