master-bc-442

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