master-qa-6045-1

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