upstream merge for JMonkeyEngine/jmonkeyengine