master-qa-3609

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