New idea and netbeans ignore
Renamed for consistency
Merge remote-tracking branch 'gh/master'
Merge branch 'master' into edge
Seems like this is necessary to get things working