downstream merge with jMonkeyEngine:master