master-bc-598

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