master-bc-266

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