Merging changes from rwjsoftware into trunk.
Merge branch 'master' of https://github.com/rwj-org/sandbox