master-qa-5807

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