Merge "Added bezier curve control points to TransitionData" into devel/master