Syncing with latest StormLib master