master-qa-3626

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