master-qa-5964

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