master-bc-633

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