master-bc-422

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