master-mh-537

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