master-mh-536

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