Merge pull request #1150 from riptano/empty-notes-attr