master-qa-4722-1

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