master-bc-294

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