Plugin support for core FrameContainer change.
Merge pull request #165 from csmith/master

Plugin support for core FrameContainer change.