master-qa-5822

http://issues.liferay.com/browse/LIFERAYQA-5822