Merge changes from SpaceManiac/Glowstone