LRDOCS-807 6.1.x

This change from Jesse is ready for 6.1.x. Thanks.