PR for #1589

Please review this PR for #1589.  As I have not been able to run SBT from my local build, I have not been able to test this PR. As mentioned in the notes for #1589, using the command there after "sbt package" does not run with the code changes that are apparently part of the build.

Happy to test this if someone can point me to some RTFM!