master-bc-297

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