Merge pull request #308 from pandamicro/master

Fixed #3860: Rename plist frame names to avoid name conflicts