master-qa-3612

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