Revert "Merge branch 'master' of https://github.com/Desocrit/Scripting"

This reverts commit 23c35bfc4d654587fe1042db698887dca66f9065, reversing
changes made to 8382dc6d0209f12bc73d4c7c15806e04500bdb5e.
Revert "Revert "Merge branch 'master' of https://github.com/Desocrit/Scripting""

This reverts commit edade1861f7411d82b46283d5a34b21c296cbe5f.