tonyka

Regardless of this project's future, a release needs to be tagged so that it works with the last 2 TS releases (4.8 & 4.9). The fix is already in: #2307