master-qa-6006-1

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