master-bc-437

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