master-qa-3618

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