Update to 1.3.7 + Maven 3.1.1