master-bc-317

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