master-bc-296

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