master-bc-311

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