master-bc-419

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