Sync

sync from glowstone master