master-qa-3960

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