More 1.5.1 changes.

Signed-off-by: Mike Howe <dockter@almuramc.com>
Merge branch '1.5' of https://github.com/Legacy/Spoutcraft into 1.5