Merge origin/Netbeans into Netbeans