Merge in Michael's recent commit 879cebf into the Mavenized branch