upstream merge from jMonkeyengine:master