master-qa-5938

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