Initial 2.4 Build
Revert "Initial 2.4 Build"

This reverts commit 83d6de518c9caea5a62bbe922f9e71c166bcd81a.
Revert "Revert "Initial 2.4 Build""

This reverts commit 68df07db82bb6f54dd4c2011d131972e179391a3.
Fixing for 1.5 and 1.6
GitHub lags
Again...