Redo commit 59983294b6feb35a4494cb9a73272d53da815bd4
Merge branch 'master' of github.com:macroevolution/bamm