master-bc-399

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