master-qa-4025

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