Merge "Fix PageTurnView" into devel/master