Merge pull request #1108 from sjpadgett/lbf-nationnote-issue