master-qa-3290

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