Apply Official Glowstone Commits

Latest: Dec 27, 2014.