merging updates by joequant to ensure branch works on its own with maven 3.1/3.2