LRDOCS-806

These changes from Jesse are ready for trunk. Thanks.