mchav Merge branch 'master' of https://github.com/mchav/froid

Latest commit 0fe48c3

Apr 27, 2018