master-bc-397

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