master-qa-3240

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