master-qa-5001

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