master-qa-3640

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