master-bc-315

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