Merge pull request #2006 from ZappoMan/overlaysupport

Scriptable Overlay Support