had to
had to
boostrap
merge conflicts
bootstrap
more merge conflicts
Merge pull request #87 from mwernimont/master

Bootstrap
Merge remote-tracking branch 'upstream/master'