First commit from NetBeans IDE 7.4.
Merge origin/master