Merge updates from jMonkeyEngine master branch