Merge pull request #1281 from spevans/pr_nsattributed_string_fixes