Lrdocs 450

Please merge into upstream master. Thanks.

@jrao