master-qa-3616

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