Had to reverse the clean up for MovieClip holder.
Merge branch 'develop' into feature/SwigWrapper