Merge remote-tracking branch 'remotes/gh-mjjstorey/master'

Benjamin Mako Hill || Want to submit a patch?