Created by: jstohner
Pull request #753 now against experimental. Sorry for using master in #753.
experimental
master