master-qa-4645

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