master-bc-381

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