BUG: @sjfahr dumpster fire
Merge branch 'sjfahr-master'