LRDOCS-807

This change from Jesse is ready for trunk. Thanks.