master-bc-265

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