Merge latest changes to master

As there are presently no releases, I am merging the "devel" branch to "master" on a regular basis to keep master generally up to date. This will stop once a release occurs, wherein master will begin reflecting the current "released" version.