master-qa-5745

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