From netbeans to eclipse
Merge remote-tracking branch 'origin/eclipse' into eclipse