master-qa-3611

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