Fix for BATCH-2141

I have signed and agree to the terms of the SpringSource Individual
Contributor License Agreement.