Combined #936, #942, and #946

[ctb]

This is a combination of #936, #942, and #946 - I wanted to see if the combined tests passed, and there were a few conflicts to resolve, hence this branch. I thought it'd be nice once all three were approved.

• Is it mergeable?
• make test Did it pass the tests?
• make coverage Is the new code covered?
• Did it change the command-line interface? Only additions are allowed
  without a major version increment. Changing file formats also requires a
  major version number increment.
• Was a spellchecker run on the source code and documentation after
  changes were made?

[codecov]

Codecov Report

Merging #950 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #950   +/-   ##
=======================================
  Coverage   91.33%   91.33%           
=======================================
  Files          71       71           
  Lines        5066     5066           
=======================================
  Hits         4627     4627           
  Misses        439      439           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e691d65...e691d65. Read the comment docs.