master-bc-301

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