master-bc-401

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