master-mh-540

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