Merge "Fix PageFactory to take in Texture rather than Image" into devel/master