Ignore Netbeans local configuration file
Merge remote-tracking branch 'upstream/master' into proto-jdk8