Temporarily bundle upstream mithril fix until 0.1.22 is out

Closes #1937