master-mh-541

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