master-qa-5725

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