Merge branch 'dev' of https://github.com/milk-org/milk into dev

Merge branch 'dev' of https://github.com/milk-org/milk into dev #873