Merge "PageTurnView cleanup" into devel/master