Fixes to make notes plugin functional again
Various core fixes
Merge remote-tracking branch 'upstream/master' into upstream
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/roun512/ricer2 into upstream