master-bc-382

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