master-qa-5986-1

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