LRDOCS-819-6.1.x
Merge pull request #724 from jrao/LRDOCS-819-6.1.x

https://issues.liferay.com/browse/LRDOCS-819